Skip to content

[release-4.22] revert disk size to 31G and add workaround for download pods disk usuage.#1247

Merged
openshift-merge-bot[bot] merged 2 commits into
crc-org:release-4.22from
praveenkumar:fix_disk_size_4.22
Jul 13, 2026
Merged

[release-4.22] revert disk size to 31G and add workaround for download pods disk usuage.#1247
openshift-merge-bot[bot] merged 2 commits into
crc-org:release-4.22from
praveenkumar:fix_disk_size_4.22

Conversation

@praveenkumar

@praveenkumar praveenkumar commented Jun 16, 2026

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved reliability of the system’s transient read-only startup sequence by adjusting how mount options are applied during the user-mount service.
  • Configuration
    • Changed the default virtual machine disk size to 31 (from 43) when no disk size is provided via environment settings.

@openshift-ci openshift-ci Bot requested review from anjannath and cfergeau June 16, 2026 02:51
@coderabbitai

coderabbitai Bot commented Jun 16, 2026

Copy link
Copy Markdown

Review Change Stack

Walkthrough

snc.sh lowers the default VM disk size from 43 to 31, and 99-enable-transient-ro.yaml updates the create-users-mount.service ExecStart command to disable mount option sourcing while remounting / and linking /Users to var/Users.

Changes

snc.sh and transient-ro mount update

Layer / File(s) Summary
CRC VM disk size default change
snc.sh
CRC_VM_DISK_SIZE default changed from 43 to 31.
Mount command options update
99-enable-transient-ro.yaml
create-users-mount.service ExecStart now includes unshare -m --options-source=disable before the remount and /Users symlink steps.

Estimated code review effort: 2 (Simple) | ~5 minutes

Possibly related PRs

  • crc-org/snc#1228: Related mount-flow changes in create-users-mount.service for the transient-ro /Users setup.

Suggested labels: lgtm

Suggested reviewers: anjannath

Poem

🐇 I hop where disk sizes gently shrink,
And mount options change in a blink.
/Users points home, neat as can be,
A tiny tweak for the shell-script tree.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main changes: reverting the disk size to 31G and adding a disk-usage workaround.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
snc.sh (1)

218-221: ⚡ Quick win

Consolidate the duplicated downloads-pod workaround into a helper.

Line 218 and Line 280 repeat the same delete+wait sequence; extracting a small function avoids drift when this workaround is updated later.

♻️ Proposed refactor
+# Workaround for OCPBUGS-88450
+restart_console_downloads_pods() {
+    retry ${OC} delete pod -n openshift-console -l app=console,component=downloads
+    retry ${OC} wait --for=condition=Ready pod -n openshift-console -l app=console,component=downloads --timeout=60s
+}
+
-# Remove the downloads pods because of https://redhat.atlassian.net/browse/OCPBUGS-88450
-# as workaround
-retry ${OC} delete pod -n openshift-console -l app=console,component=downloads
-retry ${OC} wait --for=condition=Ready pod -n openshift-console -l app=console,component=downloads --timeout=60s
+restart_console_downloads_pods
@@
-# Remove the downloads pods because of https://redhat.atlassian.net/browse/OCPBUGS-88450
-# as workaround
-retry ${OC} delete pod -n openshift-console -l app=console,component=downloads
-retry ${OC} wait --for=condition=Ready pod -n openshift-console -l app=console,component=downloads --timeout=60s
+restart_console_downloads_pods

Also applies to: 280-283

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@snc.sh` around lines 218 - 221, The delete and wait operations for the
downloads pods workaround (retry ${OC} delete pod and retry ${OC} wait commands)
are duplicated at lines 218-221 and lines 280-283. Extract this repeated
sequence into a dedicated helper function, then call that function from both
locations to eliminate duplication and ensure any future updates to the
workaround are consistently applied everywhere it is used.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@snc.sh`:
- Around line 218-221: The delete and wait operations for the downloads pods
workaround (retry ${OC} delete pod and retry ${OC} wait commands) are duplicated
at lines 218-221 and lines 280-283. Extract this repeated sequence into a
dedicated helper function, then call that function from both locations to
eliminate duplication and ensure any future updates to the workaround are
consistently applied everywhere it is used.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e6686247-cbae-4f35-9a1d-b60e431d455e

📥 Commits

Reviewing files that changed from the base of the PR and between 64742ce and 33954c8.

📒 Files selected for processing (1)
  • snc.sh

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@99-enable-transient-ro.yaml`:
- Line 44: The ExecStart command in the transient root override uses a mount
option unsupported by this RHCOS/util-linux base, so the remount step will fail
and the symlink setup in the same shell will never happen. Update the command in
the systemd unit to use a remount approach compatible with RHCOS 9.8 and keep
the `/Users` symlink creation tied to the successful remount path. Make sure the
fix is applied in the override that defines ExecStart so the startup behavior is
reliable even when the shell prefix ignores nonzero exit codes.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 2840fe0b-59fd-41ef-aca3-a0735890e747

📥 Commits

Reviewing files that changed from the base of the PR and between 33954c8 and 52c8272.

📒 Files selected for processing (2)
  • 99-enable-transient-ro.yaml
  • snc.sh

Comment thread 99-enable-transient-ro.yaml
@praveenkumar

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@praveenkumar

Copy link
Copy Markdown
Member Author

/retest

@anjannath

Copy link
Copy Markdown
Member

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Jul 13, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anjannath

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit 65ae637 into crc-org:release-4.22 Jul 13, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants